Check the Self-type of inherent associated constants #58353
Merged
+74
−30
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
arielb1
reviewed
Feb 10, 2019
matthewjasper
force-pushed
the
typeck-pattern-constants
branch
2 times, most recently
from
c468033
to
a7ae7a2
Compare
matthewjasper
changed the title
|
Removed the overlap with #58371 |
arielb1
reviewed
Feb 12, 2019
src/librustc_typeck/check/mod.rs
Outdated
| @@ -2236,7 +2236,9 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { | |||
| hir_id, def_id, substs, user_self_ty, self.tag(), | |||
| ); | |||
|
|
|||
| if !substs.is_noop() { | |||
| if !substs.is_noop() || user_self_ty.map_or(false, |ty| { | |||
| ty.has_free_regions() || ty.has_projections() || ty.has_infer_types() | |||
There was a problem hiding this comment.
~~Is there some justification for why these checks are enough?~~Found it
If there is, could you write it in a comment?
There was a problem hiding this comment.
Even if these checks are enough, shouldn't they be run on the pair (substs, ty)? i.e.
let types = (substs, ty); // yes there are TypeFoldable impls for pairs and options
if types.has_free_regions() || types.has_projections() || types.has_infer_types() {
// ...
}There was a problem hiding this comment.
Nah I've seen a comment at https://github.com/rust-lang/rust/blob/a7ae7a21624952f5bfc6aaf88e53351385b89dd4/src/librustc_typeck/check/mod.rs#L2436-L2444
Maybe move the check there it to a separate function (needs_user_type_annotation), while still doing the types trick (where T: TypeFoldable<'tcx> on that function, and then call it)?
|
r=me with the |
matthewjasper
force-pushed
the
typeck-pattern-constants
branch
from
a7ae7a2
to
283ffcf
Compare
|
@bors r+ |
|
📌 Commit 283ffcf has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 14, 2019
…nts, r=arielb1 Check the Self-type of inherent associated constants r? @arielb1
|
⌛ Testing commit 283ffcf with merge df4ed96c920c6fe2ae1b95fac48321e46808be0b... |
|
@bors treeclosed=1000 |
|
💔 Test failed - checks-travis |
bors
added
S-waiting-on-review
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@bors retry -- apparently we can't clone the repo anymore on macOS |
bors
removed
the
S-waiting-on-review
bors
added
the
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 20, 2019
…nts, r=arielb1 Check the Self-type of inherent associated constants r? @arielb1
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 23, 2019
…nts, r=arielb1 Check the Self-type of inherent associated constants r? @arielb1
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 23, 2019
…nts, r=arielb1 Check the Self-type of inherent associated constants r? @arielb1
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 23, 2019
…nts, r=arielb1 Check the Self-type of inherent associated constants r? @arielb1
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 23, 2019
…nts, r=arielb1 Check the Self-type of inherent associated constants r? @arielb1
Centril
added a commit
to Centril/rust
that referenced
this pull request
Feb 23, 2019
…nts, r=arielb1 Check the Self-type of inherent associated constants r? @arielb1
bors
added a commit
that referenced
this pull request
Feb 23, 2019
Rollup of 16 pull requests Successful merges: - #58100 (Transition librustdoc to Rust 2018) - #58122 (RangeInclusive internal iteration performance improvement.) - #58199 (Add better error message for partial move) - #58227 (Updated RELEASES.md for 1.33.0) - #58353 (Check the Self-type of inherent associated constants) - #58453 (SGX target: fix panic = abort) - #58476 (Remove `LazyTokenStream`.) - #58526 (Special suggestion for illegal unicode curly quote pairs) - #58595 (Turn duration consts into associated consts) - #58609 (Allow Self::Module to be mutated.) - #58628 (Optimise vec![false; N] to zero-alloc) - #58643 (Don't generate minification variables if minification disabled) - #58648 (Update tests to account for cross-platform testing and miri.) - #58654 (Do not underflow after resetting unmatched braces count) - #58658 (Add expected/provided byte alignments to validation error message) - #58667 (Reduce Miri-related Code Repetition `like (n << amt) >> amt`) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @arielb1